bitkeeper revision 1.1236.28.2 (42340b1fxpFQd7KdettTA0qbWMD-rg)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Sun, 13 Mar 2005 09:42:55 +0000 (09:42 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Sun, 13 Mar 2005 09:42:55 +0000 (09:42 +0000)
commit7d1e0ea248e8773e3c73d932ab5a7ec5bd0dd035
tree86b66f5361111af6a1a683b74b617e9df6e05128
parent5f53c9cfb806550887ac8f510d0e21d1bb3bbe9f
bitkeeper revision 1.1236.28.2 (42340b1fxpFQd7KdettTA0qbWMD-rg)

Manual merge.
Signed-off-by: Keir Fraser <keir@xensource.com>
xen/common/domain.c
xen/include/public/io/domain_controller.h